Automatic By-pass mode